Always check non-major-mode replacements in which-key--maybe-replace
authorJustin Burkett <justin@burkett.cc>
Mon, 25 Feb 2019 14:57:03 +0000 (09:57 -0500)
committerJustin Burkett <justin@burkett.cc>
Mon, 25 Feb 2019 14:57:03 +0000 (09:57 -0500)
which-key.el

index 21d159a448db76b34665e5243c57e4fdba473eeb..068c23cb5e6d2f88d32974d750e44a4c6797b586 100644 (file)
@@ -1437,9 +1437,9 @@ which are strings. KEY is of the form produced by `key-binding'."
          one-match)
     (if pseudo-binding
         pseudo-binding
-      (let* ((all-repls (or (cdr-safe
-                             (assq major-mode which-key-replacement-alist))
-                            which-key-replacement-alist)))
+      (let* ((all-repls
+              (append (cdr-safe (assq major-mode which-key-replacement-alist))
+                      which-key-replacement-alist)))
         (dolist (repl all-repls key-binding)
           (when (and (or which-key-allow-multiple-replacements
                          (not one-match))